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

1692 Commits

Author SHA1 Message Date
Eric Fischer
b2ddeee2d2 am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp

* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
  Import revised translations.  DO NOT MERGE
 2010-10-25 16:19:42 -07:00
Eric Fischer
3d1ce9ec2a Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-25 16:14:47 -07:00
Eric Fischer
0820821213 Import revised translations. DO NOT MERGE 
Change-Id: I404fe29521193ca9d0a3689d4a786253dc27e2d6
 2010-10-25 15:41:31 -07:00
Jeff Hamilton
fecc5f066d am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread 
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp

* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
  Add a RHS status bar slot for NFC.
 2010-10-25 14:49:07 -07:00
Jeff Hamilton
e0be933ec7 Add a RHS status bar slot for NFC. 
Change-Id: I62cbcec051a2c69f76fb9a5b9ff6f6bc05a8257b
 2010-10-25 16:41:41 -05:00
Eric Fischer
d13f5f4fea am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:08:27 -07:00
Eric Fischer
67496e591d Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:06:38 -07:00
Eric Fischer
26dc88afdb am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread 2010-10-22 16:01:34 -07:00
Eric Fischer
36504f2d9c Import revised translations. DO NOT MERGE 
Change-Id: If41b9f790002bb3cf0adb5214955f496a7170e61
 2010-10-22 15:24:30 -07:00
Eric Fischer
c5cde13397 Add a space before the weekday in the zh_CN lock screen date format. 
Bug 3121853

Change-Id: I3685079bc504544c8d244d8a926c02a5eb367d21
 2010-10-22 14:52:46 -07:00
Dianne Hackborn
101f14b275 am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread 
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp

* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
 2010-10-21 20:17:56 -07:00
Dianne Hackborn
a6d9c7c04c Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE 
Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
 2010-10-21 15:32:06 -07:00
Brad Fitzpatrick
0c55136893 am 15358e14: Merge "Make the base direction of the Arabic error pages RTL" 
Merge commit '15358e145622df90942a444a63ae0006713b636d' into gingerbread-plus-aosp

* commit '15358e145622df90942a444a63ae0006713b636d':
  Make the base direction of the Arabic error pages RTL
 2010-10-21 09:10:55 -07:00
Brad Fitzpatrick
ba1b1c9c22 am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL" 
Merge commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b' into gingerbread-plus-aosp

* commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b':
  Set the base direction of the Hebrew error pages to RTL
 2010-10-21 09:10:47 -07:00
Justin Ho
a747b43993 am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 
Merge commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp

* commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616':
  DO NOT MERGE - Updated media playback transport controls (b/3116268)
 2010-10-20 14:04:00 -07:00
Justin Ho
6312822111 DO NOT MERGE - Updated media playback transport controls (b/3116268) 
Change-Id: Ic496308d4f72e9135e35a1b29bc20feb990c3507
 2010-10-20 12:44:46 -07:00
Shachar Shemesh
2fdf272855 Make the base direction of the Arabic error pages RTL 
Change-Id: I10df9cb92d18850e8893298b2edfd9e57ca5cfef
 2010-10-20 11:01:32 -07:00
Shachar Shemesh
56a7739755 Set the base direction of the Hebrew error pages to RTL 
Change-Id: I435e724f9638e294b7e03527e7c6244a307f010e
 2010-10-20 11:01:26 -07:00
Dianne Hackborn
69a19fdbff am 3d2818d3: Remove public resource padding. 
Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp

* commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8':
  Remove public resource padding.
 2010-10-18 18:41:12 -07:00
Dianne Hackborn
3d2818d34f Remove public resource padding. 
Change-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780
 2010-10-18 18:20:02 -07:00
Nick Pelly
6b09a90a81 am e47150e9: Fix up NFC permissions. 
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp

* commit 'e47150e933e6f610546f57183477f324566e521e':
  Fix up NFC permissions.
 2010-10-18 10:26:12 -07:00
Nick Pelly
e47150e933 Fix up NFC permissions. 
The initial (vendor) implementation had 4 perms, replace with 1.

Requires no permissions:
- Viewing UID, type of discovered tags and cards.
- Viewing the NDEF message contents of NDEF formatted tags and cards.

Requires android.permission.NFC
- Get/Set the local tag "MyTag"
- Creating or using a RawTagConnection (transceive())
- Creating or using a NdefTagConnection (write()/read())

Change-Id: I1b585c7d91738bed6261277061a48cf7c939482a
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-18 10:04:40 -07:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card 
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
 2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - 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