drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,527 Commits 1 Branch 0 Tags
73cd4fff52
Commit Graph

1670 Commits

Author SHA1 Message Date
Dianne Hackborn
964eb4389b am 42499170: Implement issue and - wipe sd card 
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue  and  - wipe sd card
 2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue and - wipe sd card 
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
 2010-10-16 16:32:15 -07:00
Kenny Root
097ea0bb50 am dc83fd5a: Merge "Import revised translations DO NOT MERGE" into gingerbread 
Merge commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8' into gingerbread-plus-aosp

* commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8':
  Import revised translations DO NOT MERGE
 2010-10-15 18:41:08 -07:00
Justin Ho
bce520e646 am b3c2d480: Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread 
Merge commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca' into gingerbread-plus-aosp

* commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca':
  DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
 2010-10-15 18:39:33 -07:00
Justin Ho
e35cd5f569 am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread 
Merge commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940' into gingerbread-plus-aosp

* commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940':
  DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
 2010-10-15 18:24:30 -07:00
Justin Ho
92e0fd6ce2 am d3643668: Merge "DO NOT MERGE - Updated ADB icon" into gingerbread 
Merge commit 'd364366824bf2b0aef81780eb673a42e0ba33bce' into gingerbread-plus-aosp

* commit 'd364366824bf2b0aef81780eb673a42e0ba33bce':
  DO NOT MERGE - Updated ADB icon
 2010-10-15 18:23:18 -07:00
Kenny Root
dc83fd5a50 Merge "Import revised translations DO NOT MERGE" into gingerbread 2010-10-15 16:55:40 -07:00
Justin Ho
1ef2006409 DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi) 
Change-Id: I5f86585618b008b727de2236b75b357c87840ecf
 2010-10-15 16:15:16 -07:00
Kenny Root
88b6faad2c Import revised translations DO NOT MERGE 
Change-Id: Ifa466bf152e7331f2ea16e925e714690d9034f3a
 2010-10-15 15:11:18 -07:00
Justin Ho
ff14aa16ba DO NOT MERGE - Updated media transport controls (hdpi and mdpi) 
Change-Id: I9b91c4bc13909017f433724e7c21de0db690eff6
 2010-10-15 14:03:57 -07:00
Justin Ho
7e9f686413 DO NOT MERGE - Updated ADB icon 
Change-Id: I358ce60203746ccf38d92f71d1c684670737c97b
 2010-10-15 11:31:35 -07:00
Justin Ho
6e48b5f97a am b593d976: Merge "Updated GPS icons and new status bar background" into gingerbread 
Merge commit 'b593d976137389dcbe061f10ec13d79f0427baa3' into gingerbread-plus-aosp

* commit 'b593d976137389dcbe061f10ec13d79f0427baa3':
  Updated GPS icons and new status bar background
 2010-10-14 18:36:39 -07:00
Justin Ho
852fcaf183 Updated GPS icons and new status bar background 
Change-Id: If901a145b7cdb33b32076dcfb6964be59e3967da
 2010-10-14 18:25:50 -07:00
Justin Ho
fd28b45125 am 1fefe88c: Another attempt at popup assets (hdpi and mdpi) 
Merge commit '1fefe88cd0509df1e04e349f3caef7e5826d3e90' into gingerbread-plus-aosp

* commit '1fefe88cd0509df1e04e349f3caef7e5826d3e90':
  Another attempt at popup assets (hdpi and mdpi)
 2010-10-14 17:42:08 -07:00
Justin Ho
1fefe88cd0 Another attempt at popup assets (hdpi and mdpi) 
Change-Id: Iaa0e9b5f3545400b371c029e4152f52b113ab091
 2010-10-14 17:26:54 -07:00
Kenny Root
b7f8032a7e am 229309e5: Merge "Import revised translations" into gingerbread 
Merge commit '229309e582dfdd63c1ce903c73b63bcd74c75567' into gingerbread-plus-aosp

* commit '229309e582dfdd63c1ce903c73b63bcd74c75567':
  Import revised translations
 2010-10-14 14:30:41 -07:00
Kenny Root
229309e582 Merge "Import revised translations" into gingerbread 2010-10-14 14:17:57 -07:00
Roy West
d23cc4b814 am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread 
Merge commit '29f28cdc5315d11919595bf8623d6a67797a34e7' into gingerbread-plus-aosp

* commit '29f28cdc5315d11919595bf8623d6a67797a34e7':
  Change storage names to match 10-13 decision
 2010-10-14 12:03:19 -07:00
Kenny Root
4cc79da76c Import revised translations 
Change-Id: I66df6f7374f03bd6596a55026123c6139ab92c83
 2010-10-14 09:41:52 -07:00
Roy West
c5c3bae565 Change storage names to match 10-13 decision 
Change-Id: I1dc760846e7031a7cd090436da556533961695e1
 2010-10-14 05:23:23 -07:00
Justin Ho
d9fdcfdaad am c9110970: Merge "Updated media transport controls" into gingerbread 
Merge commit 'c911097095d0dd909abf4f77628f2154be6dbf9a' into gingerbread-plus-aosp

* commit 'c911097095d0dd909abf4f77628f2154be6dbf9a':
  Updated media transport controls
 2010-10-13 17:47:19 -07:00
Justin Ho
f0f95e61d4 Updated media transport controls 
Change-Id: I928b7fcd0f9bd11d5f642e3c5207b00099fc8b41
 2010-10-13 17:39:24 -07:00
Justin Ho
31e5901e4c am b6634127: Merge "Updating popup center asset (v5)" into gingerbread 
Merge commit 'b663412741ca3fa30473106a7bda3a8a95a5e194' into gingerbread-plus-aosp

* commit 'b663412741ca3fa30473106a7bda3a8a95a5e194':
  Updating popup center asset (v5)
 2010-10-13 17:33:36 -07:00
Justin Ho
4cc49d3e80 Updating popup center asset (v5) 
Change-Id: I0acb31925e011ddbd668894f1291bc1ee94e5c97
 2010-10-13 17:11:26 -07:00
Justin Ho
27023cc5fe am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 
Merge commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5' into gingerbread-plus-aosp

* commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
 2010-10-12 20:32:56 -07:00
Justin Ho
e03471e12f Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 2010-10-12 20:30:36 -07:00
Justin Ho
c42d196f96 am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background 
Merge commit '33bae9b826145677585a2171f4986d4c6433fd0d' into gingerbread-plus-aosp

* commit '33bae9b826145677585a2171f4986d4c6433fd0d':
  Updated lockscreen asset (Hiroshi), new menu background
 2010-10-12 20:24:37 -07:00
Justin Ho
33bae9b826 Updated lockscreen asset (Hiroshi), new menu background 
Change-Id: Ibe8c535bcdd35668c7aae87b6e8c1ef622f3e148
 2010-10-12 20:19:14 -07:00
Justin Ho
cdbd8ab789 Updated popup_ 9 patches and removing text_select_handle (hdpi) 
Change-Id: I101a4ad12e7e88621073f860e39dcb16730d7722
 2010-10-12 19:14:10 -07:00
Nick Pelly
6066da89a4 am 590b73bc: NFC API revision round 2. 
Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp

* commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6':
  NFC API revision round 2.
 2010-10-12 19:00:54 -07:00
Nick Pelly
590b73bc5b NFC API revision round 2. 
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-12 18:37:26 -07:00
Justin Ho
dfd37a4748 am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 
Merge commit '45738f6700cff689eacda7c8192b76939ba20591' into gingerbread-plus-aosp

* commit '45738f6700cff689eacda7c8192b76939ba20591':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
 2010-10-12 17:40:47 -07:00
Justin Ho
45738f6700 Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 2010-10-12 17:38:44 -07:00
Justin Ho
a78c85482e Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi) 
Change-Id: Ic7089d0277582506b745cfa73d1a7bb311c600a7
 2010-10-12 17:29:06 -07:00
Jeff Brown
7eb67fb440 am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread 
Merge commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551' into gingerbread-plus-aosp

* commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551':
  Add text selection handles to preloaded drawables.
 2010-10-12 16:12:34 -07:00
Jeff Brown
fa3d9557c8 Merge "Add text selection handles to preloaded drawables." into gingerbread 2010-10-12 16:08:59 -07:00
Jeff Brown
b0061549a2 Add text selection handles to preloaded drawables. 
Change-Id: Iad48388ada7a555681290998f4cb6f8390aa05d4
 2010-10-12 15:22:13 -07:00
Joe Onorato
9a12a3c8d4 am ba799098: Merge changes I76513387,I335fb671 into gingerbread 
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp

* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
  Remove dead code, and make the animation a setting.
  turn off the electron beam
 2010-10-12 14:46:23 -07:00
Joe Onorato
b08a1af667 Remove dead code, and make the animation a setting. 
When we don't do the brightness fade, turn off the electron beam instead.

Change-Id: I76513387c4fb420a67e59e005f6e8c3bc72f7f08
 2010-10-12 14:16:11 -07:00
Chung-yih Wang
b99db0c70e am 4367ab00: Set the wifi-only for SIP service as the default config. 
Merge commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551' into gingerbread-plus-aosp

* commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551':
  Set the wifi-only for SIP service as the default config.
 2010-10-11 21:49:26 -07:00
Chung-yih Wang
4367ab00ed Set the wifi-only for SIP service as the default config. 
Change-Id: I90d2d14b5d9c953e45f85d3d5128d096ea17b22e
bug-id: http://b/3068006
 2010-10-12 12:39:50 +08:00
Dianne Hackborn
a007ab294d am ffbc4b94: Merge "Fix SD card mounting issues and " into gingerbread 
Merge commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83' into gingerbread-plus-aosp

* commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83':
  Fix SD card mounting issues  and
2010-10-11 19:17:05 -07:00
Dianne Hackborn
ffbc4b948d Merge "Fix SD card mounting issues and " into gingerbread 2010-10-11 19:13:33 -07:00
Dianne Hackborn
d39d515b91 Fix SD card mounting issues and 
Change-Id: I79572bb4e92d2546abd97512a119ae74f0d72019
3074555: Kill "Shared storage safe to remove" notification
3072332: "blank shared storage" notification doesn't go anywhere
 2010-10-11 19:12:21 -07:00
Joe Onorato
14854820ea am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread 
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp

* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
  Add a configuration option to turn on the screen when you unplug the device.
 2010-10-11 15:22:30 -07:00
Joe Onorato
6d74765662 Add a configuration option to turn on the screen when you unplug the device. 
Bug: 3068624
Change-Id: I7366ece2528b31feee920f4600a475e81a0f3709
 2010-10-11 15:16:28 -07:00
Gilles Debunne
1457bb0ef6 am 6b8bdaa9: New AppsPermission and market style 
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp

* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
  New AppsPermission and market style
 2010-10-10 18:08:25 -07:00
Gilles Debunne
6b8bdaa9c8 New AppsPermission and market style 
Bug 3067333

Change-Id: Ibbf444cfd9b1e2d7b51f4194d57c6dee30ac18ee
 2010-10-10 17:57:55 -07:00
Justin Ho
90390e6918 am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread 
Merge commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df' into gingerbread-plus-aosp

* commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df':
  Updated media playback controls, unlock screen, misc framework assets
 2010-10-10 16:38:14 -07:00
Justin Ho
5b640bdee9 Updated media playback controls, unlock screen, misc framework assets 
Change-Id: Ib7ee3d0ad81f2f27c33dcf698d5270b464d4430e
 2010-10-10 16:07:22 -07:00