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

9572 Commits

Author SHA1 Message Date
Winson Chung
38c010dd05 am 06e564d2: am e70eb503: am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit '06e564d23309dc1c5198eda98e975b7fc5f00c61':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 19:17:19 +00:00
Winson Chung
58865b6797 am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit 'f9c1251b0ca90467a0532b84fc95448e10ccfb95':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 18:06:38 +00:00
Winson Chung
ec396d6399 Initial changes to add task affiliation styling. (Bug 16656169) 
- Fixing issue with launch-in-background animation
 2014-08-07 17:57:25 +00:00
Chet Haase
d9f0980441 am 95aab922: Allow TimePicker/DatePicker to use legacy layout style 
* commit '95aab922b35af8aa55d4340a971d07ac35d99d95':
  Allow TimePicker/DatePicker to use legacy layout style
 2014-08-07 14:32:51 +00:00
Chet Haase
3053b2fdcf Allow TimePicker/DatePicker to use legacy layout style 
In L, the TimePicker was rewritten to use a clock face and the
DatePicker was rewritten to use a calendar. This
change allows developers to opt into the old style instead
(android:timePickerMode="spinner|clock" and
android:datePickerMode="spinner|calendar").)

Issue #16717952 Pre-L style android.widget.TimePicker on L
Issue #16846963 Allow developer to use legacy DatePicker appearance

Change-Id: I4ee071fcbc5bf25eab83d6a5cb6ff352a603f90a
 2014-08-07 14:28:49 +00:00
Alan Viverette
c175ea474b am 37f56e55: Update branding colors 
* commit '37f56e55592be690c031090eed3e9e32adb3c1af':
  Update branding colors
 2014-08-07 01:29:28 +00:00
Alan Viverette
ec9d464a59 Update branding colors 
BUG: 16845793
BUG: 16851916
Change-Id: I79a15752b5dda8f3c9f159826c61e3d2a6c8bd48
 2014-08-07 01:13:23 +00:00
Chet Haase
7fb80a7aa5 am f05ef04c: am b965512b: am 95aab922: Allow TimePicker/DatePicker to use legacy layout style 
* commit 'f05ef04c0f3707727e458065c8edc54afddabc25':
  Allow TimePicker/DatePicker to use legacy layout style
 2014-08-07 14:41:01 +00:00
Alan Viverette
dba9dc0481 am 919aea08: am 654d6aa4: am 37f56e55: Update branding colors 
* commit '919aea08da49815ea5456d7dee0cd9a0c7d51da5':
  Update branding colors
 2014-08-07 01:40:51 +00:00
Matthew Xie
485ccdefc5 am 678363a5: am d7f5d55e: am 26446217: Merge "Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access" into lmp-dev 
* commit '678363a591fee31f87938fbff6d855a652a63ae3':
  Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access
 2014-08-06 19:55:00 +00:00
Matthew Xie
ea45942d46 am 26446217: Merge "Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access" into lmp-dev 
* commit '26446217b8713ab4387e241935c40fc2f1794f1c':
  Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access
 2014-08-06 19:08:20 +00:00
Fabrice Di Meglio
b31086e869 am 46ccd1f7: Make SwitchPreference switch more Material 
* commit '46ccd1f738e973cea73a33134b5bd37f0712ceba':
  Make SwitchPreference switch more Material
 2014-08-06 17:28:44 +00:00
Fabrice Di Meglio
52ab18bc6c Make SwitchPreference switch more Material 
- remove the padding so that we behave the same way as the CheckBoxPreference

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Ie22f389820c4a48bcf4b018d7009a07140cb493b
 2014-08-06 17:21:16 +00:00
Fabrice Di Meglio
6dbab81f6c am fb6bde54: am 70189aa8: am 46ccd1f7: Make SwitchPreference switch more Material 
* commit 'fb6bde54f1f4fcb631545270adce48841d97c2d4':
  Make SwitchPreference switch more Material
 2014-08-06 17:49:17 +00:00
Sungsoo Lim
3bb15ee6c9 am e791584a: am 0e33cbb0: am cf9c8d95: Merge "TIF: Add a content rating system for Brazil" into lmp-dev 
* commit 'e791584a7c8a675774e6a23fb948bc446b409216':
  TIF: Add a content rating system for Brazil
 2014-08-06 17:39:29 +00:00
Sungsoo Lim
11e894983d am f758de27: am a982555a: am 1b014966: Merge "TIF: Add content ratings for Australia" into lmp-dev 
* commit 'f758de276e24dbe82bd9b6110190a011aceb6797':
  TIF: Add content ratings for Australia
 2014-08-06 17:39:19 +00:00
Dongwon Kang
ddcd31b512 am 3ec9693f: am a3deeed2: am b0ee5931: Merge "TIF: Add content rating system for Spain" into lmp-dev 
* commit '3ec9693f75da7f9a8bce3e5771ce1095037e752d':
  TIF: Add content rating system for Spain
 2014-08-06 17:38:27 +00:00
Sungsoo Lim
9f8c74c5ec am 1d2dcadc: am 5d1f9fbf: am eafeec2b: Merge "TIF: Add content ratings for Netherlands" into lmp-dev 
* commit '1d2dcadcdf9d20f97d19cd8fd3525f895db5b3ca':
  TIF: Add content ratings for Netherlands
 2014-08-06 17:37:06 +00:00
Sungsoo Lim
99cc8c9a18 am 458b652e: am 1f7c0236: am 33ff97e5: Merge "TIF: Add content ratings for Germany" into lmp-dev 
* commit '458b652e772e0661736c24c499950fd7b42b302b':
  TIF: Add content ratings for Germany
 2014-08-06 17:36:57 +00:00
Sungsoo Lim
c8599cf8a1 am 4a15c224: am 6b1412ef: am 8dfb07f4: Merge "TIF: Add content ratings for France" into lmp-dev 
* commit '4a15c22489b6b06c93f4d06ff034c789c06424e8':
  TIF: Add content ratings for France
 2014-08-06 17:36:53 +00:00
Sungsoo Lim
ce9d13757b am cf9c8d95: Merge "TIF: Add a content rating system for Brazil" into lmp-dev 
* commit 'cf9c8d95525991e3f4239e24609cf020bf083495':
  TIF: Add a content rating system for Brazil
 2014-08-06 12:51:02 +00:00
Sungsoo Lim
bf2df3f46e am 1b014966: Merge "TIF: Add content ratings for Australia" into lmp-dev 
* commit '1b01496607e8ea4858cc0b3f36eb0e83d3d097dc':
  TIF: Add content ratings for Australia
 2014-08-06 12:44:00 +00:00
Dongwon Kang
3babc1d15e am b0ee5931: Merge "TIF: Add content rating system for Spain" into lmp-dev 
* commit 'b0ee59317533e2cac0efe24a85499fbfe56bee25':
  TIF: Add content rating system for Spain
 2014-08-06 02:58:02 +00:00
Matthew Xie
4565ded1a2 Merge "Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access" into lmp-dev 2014-08-06 02:12:24 +00:00
Matthew Xie
6b93229a21 Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access 
The permission is hidden. It's for Bluetooth app only. We may unhide it in the future.
Change-Id: Ibc6f7b71f0c79dc282a8e5fdc786e1c16be7a892
 2014-08-06 00:11:05 -07:00
Sungsoo Lim
6939314af8 am eafeec2b: Merge "TIF: Add content ratings for Netherlands" into lmp-dev 
* commit 'eafeec2b464437c627aa6a95b0d6b5d32da9e18d':
  TIF: Add content ratings for Netherlands
 2014-08-06 01:17:46 +00:00
Sungsoo Lim
5b65d3c990 am 33ff97e5: Merge "TIF: Add content ratings for Germany" into lmp-dev 
* commit '33ff97e556455e77a2ed0b1d21f98a4868b72e3f':
  TIF: Add content ratings for Germany
 2014-08-06 01:17:37 +00:00
Sungsoo Lim
e7a6cc3e6b am 8dfb07f4: Merge "TIF: Add content ratings for France" into lmp-dev 
* commit '8dfb07f432bf278554786e8795e87f1940212723':
  TIF: Add content ratings for France
 2014-08-06 01:17:32 +00:00
ztenghui
d19461709a am c4924092: Update the system linear progress bar 
* commit 'c492409264038d593514a88cf8ffb8b9fed59fc5':
  Update the system linear progress bar
 2014-08-05 19:50:18 +00:00
ztenghui
af8a8f3a7d Update the system linear progress bar 
bug:14622065

Change-Id: Ic08022d934763ba0cc6067af3e50c4afeb8a0e9e
 2014-08-05 19:46:36 +00:00
Sungsoo Lim
edf15bd171 am 291e9b9d: Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev 
* commit '291e9b9d30c461ad96e7619ee680d3dfe029f75c':
  TIF: A preliminary CL to add multiple rating systems
 2014-08-05 13:06:31 +00:00
Geoff Mendal
95c2d7a7ba Import translations. DO NOT MERGE 
Change-Id: Ief313376a33f19c618ef62579ec593ada0d214b9
Auto-generated-cl: translation import
 2014-08-06 10:11:44 -07:00
ztenghui
21e06fd368 am e9bc62f3: am 5685b94e: am c4924092: Update the system linear progress bar 
* commit 'e9bc62f38dec40600adc8f678c61ad1a15233cfc':
  Update the system linear progress bar
 2014-08-06 01:47:26 +00:00
Sungsoo Lim
f54f5d96ad am a9fc53a1: am ccf44a00: am 291e9b9d: Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev 
* commit 'a9fc53a1f11c6fe502657ef828b1acf5ca098de4':
  TIF: A preliminary CL to add multiple rating systems
 2014-08-05 13:26:43 +00:00
Geoff Mendal
35d7c18193 Import translations. DO NOT MERGE 
Change-Id: I333ca655d9f19996e4cb7923771a08200f6e2c43
Auto-generated-cl: translation import
 2014-08-06 08:43:28 -07:00
Sungsoo Lim
b4bbfbcef3 TIF: Add a content rating system for Brazil 
- Add Brazil TV content ratings
- Remove Italy TV content rating since it doesn't have the official one.

References:
http://en.wikipedia.org/wiki/Brazilian_Advisory_Rating_System
http://portal.mj.gov.br/services/DocumentManagement/FileDownload.EZTSvc.asp?DocumentID=%7B25A80220-B0E3-47FD-923F-246B6184C3C6%7D&ServiceInstUID=%7B59D015FA-30D3-48EE-B124-02A314CB7999%7D

Change-Id: Ibed9b4be0871b50b9dcd95be3a015f5a1e58676d
 2014-08-06 21:33:56 +09:00
Sungsoo Lim
8811f3457e Merge "TIF: Add content ratings for Netherlands" into lmp-dev 2014-08-05 00:07:36 +00:00
Sungsoo Lim
3596a9645e TIF: Add content ratings for Netherlands 
Change-Id: I17bac9587ea549f5e22bfe9c03fa50999fee5d5f
 2014-08-06 09:26:50 +09:00
Dongwon Kang
b1caf4d817 TIF: Add content rating system for Spain 
References:
 - http://codigodeautorregulacion.rtve.es/senalizacion-de-los-programas/advertencias-opticas/
 - http://en.wikipedia.org/wiki/RTVE

Change-Id: Icdde8a7f8cfb07cc4f768f95ba764ae6a519e347
 2014-08-06 11:48:45 +09:00
Sungsoo Lim
39ddf8ddc4 Merge "TIF: Add content ratings for Germany" into lmp-dev 2014-08-05 00:03:09 +00:00
Sungsoo Lim
6b444eed2c TIF: Add content ratings for Germany 
Change-Id: I7233e5d10550d6e6d2ef6f7c1c4ebd71bc271539
 2014-08-06 09:29:58 +09:00
Sungsoo Lim
f128dbf076 Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev 2014-08-05 00:03:09 +00:00
Sungsoo Lim
e6dca2cfa4 TIF: A preliminary CL to add multiple rating systems 
TODO: Add rating systems for the countries defined in this CL.

Change-Id: I128284fd8779723b5ffb5968e2a11ce4b4eae6b5
 2014-08-05 17:35:38 +09:00
Sungsoo Lim
1fd38bd996 TIF: Add content ratings for Australia 
Reference: http://www.classification.gov.au/

Change-Id: I79a85124df7e06418ff95ca39ef1db98a83c5af1
 2014-08-06 15:11:26 +09:00
Sungsoo Lim
4acc7c3f4e TIF: Add content ratings for France 
Change-Id: Ib90a9ab918a6a7187a05323fe0f0122ffe747add
 2014-08-06 09:00:53 +09:00
Jeff Tinker
6de847ad9c am 8d5f9cb2: am 37956deb: am f225e464: Merge "Allow device to be unprovisioned" into lmp-dev 
* commit '8d5f9cb2b4169c3770b5c89361452d60da765940':
  Allow device to be unprovisioned
 2014-08-04 21:01:11 +00:00
Jeff Tinker
01acb4af01 am f225e464: Merge "Allow device to be unprovisioned" into lmp-dev 
* commit 'f225e464e01055a9b5fc8f6293abf841f340da57':
  Allow device to be unprovisioned
 2014-08-04 20:51:54 +00:00
Geoff Mendal
400ffb1f5d Import translations. DO NOT MERGE 
Change-Id: I537a87991ba50754b8cb80d48bb6c3147b99a62b
Auto-generated-cl: translation import
 2014-08-04 18:21:24 +00:00
Tadashi G. Takaoka
887d8d62a7 am 8b2a9aff: Merge "Fix input method picker using Material design language" into lmp-dev 
* commit '8b2a9aff89f88ae7784cde4c4f4f52076d6c19bd':
  Fix input method picker using Material design language
 2014-08-04 11:57:54 +00:00
Jaewan Kim
119e22cddb am 009d7b75: Merge "Fix typo in tv_content_rating_systems.xml" into lmp-dev 
* commit '009d7b75746d5bef1a848a3447e5a8dd60c7894c':
  Fix typo in tv_content_rating_systems.xml
 2014-08-04 11:57:44 +00:00