Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
205,523 Commits 3 Branches 0 Tags
86fdb662a3d9c34099248910756ca18cd0b3b2f1
Commit Graph

205523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
86fdb662a3 am 4f836839: am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev 
* commit '4f836839c19aed433e7b1913ce05ccb129743fd7':
  Selectively show zen footer.
 2015-10-15 13:39:28 +00:00
Julia Reynolds
4f836839c1 am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev 
* commit '67ea77ec3fd838e1a367ad6f367970599e599a99':
  Selectively show zen footer.
 2015-10-15 13:33:35 +00:00
Julia Reynolds
67ea77ec3f Merge "Selectively show zen footer." into mnc-dr-dev 2015-10-15 13:29:51 +00:00
Chris Thornton
11543a1b85 am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev 
* commit 'ea5ad4872ec9efb27c33796e60458b4a1e3905f4':
  Don't call StopRecognition when recognition was aborted.
 2015-10-15 01:33:36 +00:00
Chris Thornton
ea5ad4872e am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev 
* commit 'd8ef44bc51a4a27cd9a57c880a367636a1377082':
  Don't call StopRecognition when recognition was aborted.
 2015-10-15 01:28:39 +00:00
Chris Thornton
d8ef44bc51 Merge "Don't call StopRecognition when recognition was aborted." into mnc-dr-dev 2015-10-15 01:24:45 +00:00
Dianne Hackborn
522222bc9b am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit 'f96ca3441ea1a22e4d9e4402942ddce4a3234860':
  Docs only change: update build version docs.
 2015-10-15 01:12:35 +00:00
Dianne Hackborn
f96ca3441e am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit '75765dbe48ed38d7044f458062510a9082750049':
  Docs only change: update build version docs.
 2015-10-15 01:05:54 +00:00
Dianne Hackborn
75765dbe48 am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit 'e34445f11a6a14dd30ba0e018b82e852ef82ecbc':
  Docs only change: update build version docs.
 2015-10-15 01:01:12 +00:00
Dianne Hackborn
e34445f11a Merge "Docs only change: update build version docs." into mnc-dev 2015-10-15 00:56:05 +00:00
Adrian Roos
67255b4403 am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit 'c007c150d5f56305e84af44d7993d8f2e6a4fc78':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:45:23 +00:00
Adrian Roos
c007c150d5 am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit '8630e18a297801238efcba8760e8d850d8920a80':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:40:45 +00:00
Adrian Roos
8630e18a29 am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit '31f19c444f5f9d22c81fcb339e51bee465ba10f9':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:35:33 +00:00
Adrian Roos
31f19c444f Merge "Send next alarm's show intent via PendingIntent" into mnc-dev 2015-10-15 00:29:56 +00:00
Roozbeh Pournader
f12a7499de am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev 
* commit '9407aa7cf0b369d31bd6c69f9c26bdf6a1f44fe9':
  Load binary hyphen data files
 2015-10-15 00:27:29 +00:00
Roozbeh Pournader
9407aa7cf0 am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev 
* commit '63aa02e47fa0fdd877b9fde7f1f6eda75b645f92':
  Load binary hyphen data files
 2015-10-15 00:22:43 +00:00
Roozbeh Pournader
63aa02e47f Merge "Load binary hyphen data files" into mnc-dr-dev 2015-10-15 00:18:36 +00:00
Adam Powell
bd4d81b08c am b248077a: am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev 
* commit 'b248077a8a239fe6fe28775a7472a89ff42fdec3':
  Fix bugs introduced in ChooserActivity
 2015-10-15 00:01:29 +00:00
Adam Powell
b248077a8a am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev 
* commit '2eac005bbfc94a774c0a3f870fd393a3e7389f8c':
  Fix bugs introduced in ChooserActivity
 2015-10-14 23:52:14 +00:00
Amit Mahajan
a41ea5e950 am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 
* commit '8fb8c37ca7c2c57466b07548effa24044e5b3ef6':
  Adding config to allow/disallow user to add APNs.
 2015-10-14 23:50:11 +00:00
Adam Powell
2eac005bbf Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev 2015-10-14 23:46:32 +00:00
Amit Mahajan
8fb8c37ca7 am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 
* commit '7b28e6ec96dfcb20cef1f321ac7539bac439d726':
  Adding config to allow/disallow user to add APNs.
 2015-10-14 23:42:13 +00:00
Amit Mahajan
7b28e6ec96 Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 2015-10-14 23:33:02 +00:00
Vineeta Srivastava
ec3513e9af am ecf89edf: am 8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev 
* commit 'ecf89edf3616800cdacec000e112e487134adb64':
  TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
 2015-10-14 21:52:11 +00:00
Vineeta Srivastava
ecf89edf36 am 8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev 
* commit '8a586c55022ee272bdcf712c7aa4e1652a261c5a':
  TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
 2015-10-14 21:45:06 +00:00
Vineeta Srivastava
8a586c5502 Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev 2015-10-14 21:39:08 +00:00
Roozbeh Pournader
58de2861c0 am 6598022d: am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev 
* commit '6598022de5447691be3551d86ad31f2e3fe0e567':
  Make Hyphenator#get() return an object.
 2015-10-14 21:18:39 +00:00
Roozbeh Pournader
6598022de5 am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev 
* commit 'bdf952aab732ebcaab0d785cd02ffb83e3738e21':
  Make Hyphenator#get() return an object.
 2015-10-14 21:12:05 +00:00
Roozbeh Pournader
bdf952aab7 Merge "Make Hyphenator#get() return an object." into mnc-dr-dev 2015-10-14 21:07:13 +00:00
Winson Chung
1c36cfd210 am d8fed39f: am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit 'd8fed39f3c53cc7764e69a2a10ad3ece718179a2':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 20:52:20 +00:00
Winson Chung
d8fed39f3c am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit 'c7a873e356e1caa815c1830ae37a6ffb3ecf480f':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 20:45:35 +00:00
Winson Chung
c7a873e356 Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 2015-10-14 20:42:21 +00:00
Julia Reynolds
97eff878a4 Selectively show zen footer. 
Only show zen footer if the active stream is affected by the current
zen mode.

Bug: 23844466
Change-Id: I08770882f12f11c3458e1e48a287139480ae7aa3
(cherry picked from commit 6aa83b4ca0)
 2015-10-14 20:22:56 +00:00
Adam Powell
4eb9871ead Fix bugs introduced in ChooserActivity 
* Wait to start animations until all state has been initialized, as
  the process of starting an Animator will set initial values,
  triggering other events relying on the configured state.

* Correctly track underlying item indexes for columns.

* Do not over-extend the ResolverDrawerLayout when multiple rows
  animate in.

Bug 24926885
Bug 24928706

Change-Id: I4772e1a0ba79b17b5dc19c778f3ef0cb5200c533
 2015-10-14 13:10:18 -07:00
Raph Levien
35e026929b Load binary hyphen data files 
Support for loading the pre-compiled binary format for hyphenation
patterns.

Bug: 21562869
Bug: 21826930
Bug: 24570591
Change-Id: Iaeaa9c9ac9dac236af6b0d7894c2e2396bc8447d
(cherry picked from commit 091dba2de1)
 2015-10-14 19:11:33 +00:00
Roozbeh Pournader
0453112de6 Make Hyphenator#get() return an object. 
Previously, a native pointer was returned. After this change, callers
should call getNativePtr() if they want to get the native pointer instead.

Bug: 21492297
Bug: 24570591
Change-Id: I745bd88e6e8c86078fffb07f90f8d8f24215410c
(cherry picked from commit e7eac6f540)
 2015-10-14 19:10:44 +00:00
Sungmin Choi
b053b3cc60 TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar 
Bug: 24850563
Change-Id: I36e54e9bde9610f908b1092e11c476dcae76526d
Signed-off-by: haesun.kim <haesun.kim@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
 2015-10-14 11:13:50 -07:00
Erik Kline
9c8abd1d7a am f23eece2: am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev 
* commit 'f23eece2006f04785fa1b873afc66f01bb238e0b':
  Don't crash if an invalid always-on VPN profile is configured.
 2015-10-14 17:48:48 +00:00
Erik Kline
f23eece200 am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev 
* commit 'b7e722b88fab8b67f8a2ef54a7acb8c6672b6f46':
  Don't crash if an invalid always-on VPN profile is configured.
 2015-10-14 17:42:14 +00:00
Erik Kline
b7e722b88f Merge "Don't crash if an invalid always-on VPN profile is configured." into mnc-dr-dev 2015-10-14 17:37:57 +00:00
Geoff Mendal
62679a1f6d am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE 
* commit 'c095272a807880bca2848b102438ec9a13dec749':
  Import translations. DO NOT MERGE
 2015-10-14 14:13:42 +00:00
Geoff Mendal
c095272a80 am 7013f0c8: (-s ours) Import translations. DO NOT MERGE 
* commit '7013f0c8f2adcc14acd052f4066827ad31f17195':
  Import translations. DO NOT MERGE
 2015-10-14 14:07:29 +00:00
Geoff Mendal
7013f0c8f2 Import translations. DO NOT MERGE 
Change-Id: Iefcade8293a0fa228423e3eef730910af4a76853
Auto-generated-cl: translation import
 2015-10-14 06:59:48 -07:00
Matthew Williams
f23e617bcd am 6c8ddfcc: am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev 
* commit '6c8ddfcc5a34af2dd3c28c7b1c46ab51967b3213':
  Correctly reschedule failed periodic
 2015-10-14 03:10:08 +00:00
Matthew Williams
6c8ddfcc5a am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev 
* commit '40ec3a924663c831e47f5e851b2978b96ff428fb':
  Correctly reschedule failed periodic
 2015-10-14 03:03:42 +00:00
Matthew Williams
40ec3a9246 Merge "Correctly reschedule failed periodic" into mnc-dr-dev 2015-10-14 03:00:16 +00:00
Jean-Michel Trivi
acb867f17c am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'bf76eb7cdaf1e2199217354bd6cbeaf37657486f':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:27:30 +00:00
Jean-Michel Trivi
bf76eb7cda am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'a2ed535c67a6c6fbe2ae4a086193ad68711e2129':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:22:32 +00:00
Adrian Roos
f3c9215afb am 66536146: am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev 
* commit '66536146bfeac90346b898f56c7e955ad83cd005':
  Show charging speed in all locales
 2015-10-13 23:08:26 +00:00
Adrian Roos
66536146bf am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev 
* commit '4673b259bc1b362fee206c7476c5fde3f53b4e20':
  Show charging speed in all locales
 2015-10-13 23:01:55 +00:00