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

196305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
3b866bee86 Make sure endClosing doesn't get called too early 
Bug: 22196478
Bug: 22184101
Change-Id: I3488c40b74a080efbba9b1544f9709f7e509988b
 2015-06-30 22:30:08 +00:00
Svet Ganov
1aaad610df Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev 2015-06-30 21:44:34 +00:00
Doris Liu
e08f3b3ff5 Merge "Resolve CompoundButton's foreground drawable for layout direction change" into mnc-dev 2015-06-30 21:42:43 +00:00
Doris Liu
99aa13ec10 Merge "Allow null child view when checking whether divider should draw" into mnc-dev 2015-06-30 21:35:09 +00:00
Chris Craik
ca985b54c8 Merge "Don't display layout bounds of GONE views" into mnc-dev 2015-06-30 21:22:26 +00:00
Doris Liu
f102d4266b Allow null child view when checking whether divider should draw 
The beginning divider should draw before the first child that is not
set to GONE. Incidentally, there needs to be a check for such a child,
which involves checking the visibility of all the children with lower
indices. This CL takes into account the scenarios where children with
lower indices could be null, in which case we'll treat them as if they
were GONE.

Bug: 22199594
Change-Id: Iefc73ef87beec219898c967b9a3ccebd1e3b5b4c
 2015-06-30 13:57:28 -07:00
Alan Viverette
b35e866713 Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev 2015-06-30 20:53:31 +00:00
Chris Craik
a763bb83cf Merge "Saturate alpha values when overlaying glyphs" into mnc-dev 2015-06-30 20:52:26 +00:00
Chris Craik
a1dab8bb0f Don't display layout bounds of GONE views 
bug:22126532

Change-Id: Ib7816346e0f6ff54fcf7b180bf4042ce113728b9
 2015-06-30 13:51:26 -07:00
Alex Klyubin
89575b678c Merge "Enforce IND-CPA requirement when generating asymmetric keys." into mnc-dev 2015-06-30 20:48:19 +00:00
Alan Viverette
6ef129e09d Handle null argument in ImageView.setImageIcon() 
Provides consistency with setImageDrawable(). Also updates docs and
annotations for setImageZzz() methods that can take null.

Bug: 21664964
Change-Id: Ia9b7f8ee9edb23eeea457520bea4dd261decc794
 2015-06-30 13:32:27 -07:00
Adam Lesinski
40fab055bb Merge "Add round/notround qualifier to docs" into mnc-dev 2015-06-30 20:31:26 +00:00
Adam Lesinski
32ddd53466 Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 2015-06-30 20:30:46 +00:00
Chris Craik
de25a672b1 Saturate alpha values when overlaying glyphs 
bug:19062769

Glyphs were stored to the output buffer with the assumption of
non-overlap, which is incorrect for certain fonts/strings. Instead,
blend src into dst, so new glyphs don't clobber existing content.

Change-Id: I6e22037500e67d5348ee2a43d939416c23c4d1ea
 2015-06-30 13:24:18 -07:00
Bryce Lee
5cd293b379 Merge "Merge commit '91d2cbf4' into manualmerge" into mnc-dev 2015-06-30 20:15:42 +00:00
Jason Monk
583d2d9ba2 Merge "Don't allow do not disturb when volume restricted" into mnc-dev 2015-06-30 20:08:17 +00:00
Adam Lesinski
43f222f02f BatteryStats: Account for remaining OS wakelock time at the end of processing all apps 
Bug:18724932
Change-Id: I01cfd18acb3332ad35fd0d48d9c50bc37e5ccd08
 2015-06-30 12:54:41 -07:00
Adam Lesinski
f178066925 Add round/notround qualifier to docs 
Bug:22203014
Change-Id: Icc05b93f0c1beddce3bd26ae169c2e8c0e3cb898
 2015-06-30 12:40:57 -07:00
Bryce Lee
3ae447e8bb Merge commit '91d2cbf4' into manualmerge 
Change-Id: Id018e65bdbd67f040af13a07207cac33a4a2a158
 2015-06-30 12:31:41 -07:00
Svet Ganov
4a23ac4589 Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 2015-06-30 19:24:05 +00:00
John Spurlock
a81c2e16fa Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev 2015-06-30 19:22:16 +00:00
John Spurlock
1a830f0d80 Volume: Defend against monkeys pulling tags too early. 
Bug: 22197117
Change-Id: I0f944fbc7fd6dd5176300c4fd0fd7b79234efe2d
 2015-06-30 15:14:27 -04:00
Maxim Bogatov
7a2e4b8f80 Merge "Let TextView clear accessibility selection index" into mnc-dev 2015-06-30 18:45:52 +00:00
Bryce Lee
d903e580aa am cc2ba220: Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev 
* commit 'cc2ba2200ddc9d95753fa930aa245540fac880e8':
  Only enable theater mode by button press after setup.
 2015-06-30 18:34:47 +00:00
Doris Liu
3380e69f55 Resolve CompoundButton's foreground drawable for layout direction change 
This CL adds a step to resolve CompoundButton's foreground drawable when
layout direction has been changed. Prior this CL, only background drawable
of the button resolves its layout direciton in respond to system wide
layout direction change. This CL makes the foreground and background
drawables consistent in layout direciton.

Bug: 16376848
Change-Id: I9a4eb1e010e6ab61ef8684005508bd36486ec1f3
 2015-06-30 11:26:47 -07:00
David Friedman
3acd16032c am eb7f1a94: am 9f2e92ee: Merge "Docs: Localized M-Preview pages Bug: 21789313" into mnc-preview-docs 
* commit 'eb7f1a948a202cec51c0c09c3fbc1c557674380b':
  Docs: Localized M-Preview pages Bug: 21789313
 2015-06-30 17:57:45 +00:00
Andrew Solovay
8722e1416e am 4653cdec: am 350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs 
* commit '4653cdecab5eb6b08f23183f83034ccf50e93451':
  docs: Clarified when you can put the fragments in the root view.
 2015-06-30 17:57:36 +00:00
Yorke Lee
40dff5b47f Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev 2015-06-30 17:47:17 +00:00
Chris Wren
392527c4cc Merge "add more power manager metrics" into mnc-dev 2015-06-30 17:20:29 +00:00
Svet Ganov
6a166af8fd Installer is a part of the system with unrevocable permissions 
1. Mark the installer permissions as not revocable.

2. Make the permission result dispatch more robust to handle installer death.

bug:22012614

Change-Id: Idee30ca884b87ccf97ba1bb878d4c49912e474b8
 2015-06-30 10:15:49 -07:00
Yorke Lee
1249bdbe90 Fix TelecomManager.isVoicemailNumber 
Provide an overload of PhoneNumberUtil.isVoiceMailNumber that
takes a context to prevent an NPE.

This does not fix PhoneNumberUtil.isVoicemailNumber(String number),
that will require a follow up CL.

Bug: 22184528
Change-Id: I300b70948e5ff7230989bb887ad17e222c61685d
 2015-06-30 10:15:40 -07:00
Bryce Lee
cc2ba2200d Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev 2015-06-30 17:13:04 +00:00
Abodunrinwa Toki
e40d7a6326 Merge "Fix Floating toolbar overflow width." into mnc-dev 2015-06-30 16:56:23 +00:00
Abodunrinwa Toki
685a14468e Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev 2015-06-30 16:53:26 +00:00
Svet Ganov
6dc94c5460 Merge "Update the stroage icon." into mnc-dev 2015-06-30 16:50:58 +00:00
Svet Ganov
b24ff7e03a Merge "Add read/write external storage app ops" into mnc-dev 2015-06-30 16:50:17 +00:00
Svet Ganov
06324ed4c6 Do not hold a lock when calling API to grant default permissions 
bug:22186491

Change-Id: Id0a468423048938a91598629c4921090ec082853
 2015-06-30 09:23:55 -07:00
Filip Gruszczynski
4954aff536 Merge "resolved conflicts for merge of e89d821e to mnc-dev" into mnc-dev 2015-06-30 15:19:37 +00:00
Andres Morales
3188574c14 Merge "[LockSettings] adjust legacy patterns to base 0 for unlocking keystore" into mnc-dev 2015-06-30 15:19:30 +00:00
Jason Monk
f0a60dd206 Don't allow do not disturb when volume restricted 
Bug: 21642285
Change-Id: I8e31f809506b48855eb90c67727c026deb120af5
 2015-06-30 10:54:48 -04:00
John Spurlock
eb60c42df2 Merge "Volume: Mark inactive sliders as focusable." into mnc-dev 2015-06-30 14:22:23 +00:00
George Mount
0303d9ce70 Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 2015-06-30 14:21:49 +00:00
John Spurlock
c0892c6bd6 Volume: Mark inactive sliders as focusable. 
Enabled but inactive sliders ought to be focusable, just not
focused.

Bug: 22096089
Change-Id: I95cdfc1b1258ca0e4562761031f4ee59bd35e7e3
 2015-06-30 10:17:37 -04:00
Chris Wren
9bb290bcc3 add more power manager metrics 
dream start/stop
dream duration
screen timeout setting

Bug: 21893298
Change-Id: I783f72953fc40c0d276a7845daa048e2fe0db78c
 2015-06-30 10:10:24 -04:00
Chris Wren
4572cbc917 only count clicks on zen mode selector 
We were counting all changes of mode while the panel was visible, including the
first initialization of the selector.

Bug: 21196323
Change-Id: Icf2165056f03507b0b8c6a21ec1f07830c29173a
 2015-06-30 09:43:41 -04:00
Kenny Guy
31659c253e Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-30 13:03:32 +00:00
Paul Jensen
2b61c6b16b Merge "Don't reevaluate disconnected networks" into mnc-dev 2015-06-30 11:11:14 +00:00
Billy Lau
f62f4c94a3 Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev 2015-06-30 09:05:34 +00:00
Esteban Talavera
fef8cbd6a6 Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 2015-06-30 08:55:38 +00:00
Benjamin Franz
01b079f7d2 Merge "Make ContentObservers work across profiles" into mnc-dev 2015-06-30 07:45:50 +00:00