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

167394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aravind Akella
36d94c6ba0 am 2a8be3c9: am b78c1679: am 1f9b32f0: Sensor documentation fixes. 
* commit '2a8be3c9b5c7f5c5b44232e27a9d6417b72dc2b0':
  Sensor documentation fixes.
 2014-10-14 17:56:51 +00:00
Aravind Akella
2a8be3c9b5 am b78c1679: am 1f9b32f0: Sensor documentation fixes. 
* commit 'b78c16793b1542ff786bc6ae58cafa876b4bce45':
  Sensor documentation fixes.
 2014-10-14 17:48:29 +00:00
Sarah Maddox
e02cf9934c am 3505460f: am 7666f904: am 60c5fbc3: am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '3505460f73a25a32fef1215ff86354591eef6fb9':
  Fixed a typo in Perf Tips.
 2014-10-14 17:30:39 +00:00
Alan Viverette
0a80835e4f am 3a6366f2: am a8bcf1fb: am 5bcc5b28: am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit '3a6366f25c760e79d2eae3d4bfe3e25f2e045397':
  Increase contrast for money permission
 2014-10-14 17:30:35 +00:00
Elliott Hughes
e89bfcd14d am 07b68d8a: am 81fcede8: am b8175ad3: am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit '07b68d8ad4a6f7d4fff2806819050657238e04ab':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-14 17:30:30 +00:00
Jeff Sharkey
755799c707 am 7d5e9455: am 86195bd9: am 1229d266: am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '7d5e9455f479d3a2685c84388ef752d08c49e7fc':
  DocumentsUI: Add content description for nav.
 2014-10-14 17:30:27 +00:00
Jesse Hall
3f2c8122f0 am 3e173290: am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '3e1732907b41e69fbd6ddb13de6f47c845cb85c0':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-14 17:30:23 +00:00
Amit Mahajan
fa72516ac9 am ed454542: am 38e48c2f: am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit 'ed4545423b0166f2436adee077d11b85b62ed07a':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-14 17:30:18 +00:00
Sarah Maddox
3505460f73 am 7666f904: am 60c5fbc3: am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '7666f9040957d1e85815a3cce59ec4606c83d86d':
  Fixed a typo in Perf Tips.
 2014-10-14 17:22:54 +00:00
Alan Viverette
3a6366f25c am a8bcf1fb: am 5bcc5b28: am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit 'a8bcf1fb8f81515d876205a4d416a178eb53c511':
  Increase contrast for money permission
 2014-10-14 17:22:49 +00:00
Elliott Hughes
07b68d8ad4 am 81fcede8: am b8175ad3: am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit '81fcede86d89287a5add53b256d384f9a370d77d':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-14 17:22:44 +00:00
Jeff Sharkey
7d5e9455f4 am 86195bd9: am 1229d266: am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '86195bd9a39436a9dc39de782e20892f51cf7397':
  DocumentsUI: Add content description for nav.
 2014-10-14 17:22:40 +00:00
Jesse Hall
3e1732907b am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '05bbbebb475a2816d60c4a8ec140cccddc16b269':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-14 17:22:33 +00:00
Amit Mahajan
ed4545423b am 38e48c2f: am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '38e48c2f477d6908d7d29503749cbe4290b013a7':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-14 17:22:28 +00:00
Geoff Mendal
411e14081f Merge "Import translations. DO NOT MERGE" 2014-10-14 01:28:31 +00:00
Aravind Akella
b78c16793b am 1f9b32f0: Sensor documentation fixes. 
* commit '1f9b32f006f7c506d9df5bf73294710665746397':
  Sensor documentation fixes.
 2014-10-13 22:41:15 +00:00
Sarah Maddox
7666f90409 am 60c5fbc3: am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '60c5fbc3a9cb13963d9095d699f2745c9cdb343c':
  Fixed a typo in Perf Tips.
 2014-10-13 22:36:00 +00:00
Alan Viverette
a8bcf1fb8f am 5bcc5b28: am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit '5bcc5b287b58cb69c3542c52998c6354341d8394':
  Increase contrast for money permission
 2014-10-13 22:35:57 +00:00
Elliott Hughes
81fcede86d am b8175ad3: am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'b8175ad3bf91dfd8b519e39d8f327e87e3e5aeca':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:35:53 +00:00
Jeff Sharkey
86195bd9a3 am 1229d266: am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '1229d266f60b9e40e92a5fcee8baeaedd7e8c367':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:35:49 +00:00
Jesse Hall
05bbbebb47 am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '8d3cf106aa53ccf03c9f57c4e3b4af5799e2b530':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:35:45 +00:00
Amit Mahajan
38e48c2f47 am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '3547c13e0d9188b87c64082cf9756419186fd06e':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:35:40 +00:00
Aravind Akella
1f9b32f006 Sensor documentation fixes. 
Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1
 2014-10-13 22:25:46 +00:00
Sarah Maddox
60c5fbc3a9 am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '64aec659b7b222c8663e36852f75f685c0ab8de4':
  Fixed a typo in Perf Tips.
 2014-10-13 22:08:47 +00:00
Alan Viverette
5bcc5b287b am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit '21ad8732314872cc62ba2d311343c23b1e9078b8':
  Increase contrast for money permission
 2014-10-13 22:08:43 +00:00
Elliott Hughes
b8175ad3bf am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c02ddd6a0a4643ce49150231a104d77d90c13f27':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:08:39 +00:00
Jeff Sharkey
1229d266f6 am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit 'c4d774d5d87439180eed0be45eb2242f8bf7cfaa':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:08:35 +00:00
Jesse Hall
8d3cf106aa am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:08:31 +00:00
Amit Mahajan
3547c13e0d am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '097c8d60115a9207ba4140ef99766741a2256361':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:08:28 +00:00
Sarah Maddox
64aec659b7 am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev 
* commit '8601b1b1ca75512177aa3539d33292250b5c9a2d':
  Fixed a typo in Perf Tips.
 2014-10-13 22:04:22 +00:00
Alan Viverette
21ad873231 am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev 
* commit 'b927dfc774bd9d2c52cf6fbf50fe2eca16994c27':
  Increase contrast for money permission
 2014-10-13 22:04:15 +00:00
Elliott Hughes
c02ddd6a0a am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:04:11 +00:00
Jeff Sharkey
c4d774d5d8 am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:04:06 +00:00
Jesse Hall
d4b38fe5c0 am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:03:59 +00:00
Amit Mahajan
097c8d6011 am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '1901e175079e3b7242ace7d4b3ec38af3723f91b':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:03:52 +00:00
Sarah Maddox
8601b1b1ca Merge "Fixed a typo in Perf Tips." into lmp-dev 2014-10-13 21:50:30 +00:00
Alan Viverette
b927dfc774 Merge "Increase contrast for money permission" into lmp-dev 2014-10-13 21:31:40 +00:00
Alan Viverette
6f351bcc7c am 2776b173: am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '2776b17327e99338630db96d68170b0327084b3d':
  Always project ripples
 2014-10-13 21:12:43 +00:00
Alan Viverette
2776b17327 am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '204e9f4cae2d49348c121c9738f8f33b5cb20b27':
  Always project ripples
 2014-10-13 21:07:55 +00:00
Alan Viverette
204e9f4cae am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '2f82e48abb71c92e41caa8057e3068dbfe96ed62':
  Always project ripples
 2014-10-13 21:03:21 +00:00
Alan Viverette
2f82e48abb Merge "Always project ripples" into lmp-mr1-dev 2014-10-13 20:58:48 +00:00
Elliott Hughes
c130b428c5 Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev 2014-10-13 20:55:30 +00:00
Jeff Sharkey
461b3896ba Merge "DocumentsUI: Add content description for nav." into lmp-dev 2014-10-13 20:31:04 +00:00
Jesse Hall
647e0df0c7 Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 2014-10-13 20:23:15 +00:00
Alan Viverette
dc4e791b29 Increase contrast for money permission 
BUG: 17923303
Change-Id: Ic35a9d37690ec5c4375285ca9b162cbff62db656
 2014-10-13 13:12:49 -07:00
Jeff Sharkey
b7b30f691c DocumentsUI: Add content description for nav. 
Bug: 17922955
Change-Id: I44c0107d8dd03aab36da55deeb864e328b492124
 2014-10-13 12:55:18 -07:00
Elliott Hughes
9c33f28d91 Ensure that the SIM language doesn't override the user language on the encryption UI. 
Bug: 17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
 2014-10-13 12:39:56 -07:00
Amit Mahajan
1901e17507 Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 2014-10-13 19:32:36 +00:00
Yohei Yukawa
200ee78fe6 am d6d0c3f5: am 84928e72: am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit 'd6d0c3f54ae6c1ddd0b1ea086aeba28cd3ac2632':
  Update config when "Show input method" is changed
 2014-10-13 19:17:22 +00:00
Mike Lockwood
59a24d6ca9 am 4dd24730: am b3bab92e: am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '4dd247305f4e4f3b3a7a9f52a8d1a9c6641391f3':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 19:17:17 +00:00